<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>Document</title>
</head>
<body>
    <h1>测试git</h1>
    hhh
    <xqy></xqy>
<<<<<<< HEAD
    我又来冲突啦
=======
    《今天很努力学习》
>>>>>>> a532adc13e0fb3286505e095d8fbe080871497e9
</body>
</html>